From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 27 May 2011 17:02:07 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3658^2~2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6f0c9b3020e637770fe22691331ba03c215b0782;p=emacs.git

Merge from trunk.
---

6f0c9b3020e637770fe22691331ba03c215b0782